From 030529e04b549051aae7d045f4a3d925420ec16a Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 12 Oct 2007 04:31:04 +0000 Subject: [PATCH] Avoid double-free problems svn path=/trunk/; revision=18906 --- ChangeLog | 5 +++++ gtk/updateiconcache.c | 8 -------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0e58f86545..4ccba0fe69 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-10-12 Matthias Clasen + + * gtk/updateiconcache.c: Avoid double-free problems by not + freeing data that may be cached elsewhere. + 2007-10-10 Emmanuele Bassi * gtk/gtkrecentmanager.c (gtk_recent_info_get_icon): Document diff --git a/gtk/updateiconcache.c b/gtk/updateiconcache.c index d44d93e5e0..45d0cf00ef 100644 --- a/gtk/updateiconcache.c +++ b/gtk/updateiconcache.c @@ -199,13 +199,6 @@ typedef struct guint icon_data_size; } Image; -static void -free_icon_data (IconData *icon_data) -{ - g_free (icon_data->attach_points); - g_strfreev (icon_data->display_names); - g_free (icon_data); -} static gboolean foreach_remove_func (gpointer key, gpointer value, gpointer user_data) @@ -219,7 +212,6 @@ foreach_remove_func (gpointer key, gpointer value, gpointer user_data) { /* just a .icon file, throw away */ g_free (key); - free_icon_data (image->icon_data); g_free (image); return TRUE; -- 2.30.2